Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 20:15:18 +0000 (12:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 20:15:18 +0000 (12:15 -0800)
commit5e0805d4483198bd021ae346b79ed8a3325c1017
tree31ccd2c58a47e0c862a62642da30612c6ea112f6
parent114b6d007d1eb9627cc7dedac0891016c786a393
parent5ba226ff046952e1b4450fa61e525b715464d9bc
Merge from trunk.